Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add institution type data #1290

Merged
merged 10 commits into from
Jun 14, 2022
Merged

Add institution type data #1290

merged 10 commits into from
Jun 14, 2022

Conversation

Pabloostr
Copy link
Contributor

@Pabloostr Pabloostr commented Jun 7, 2022

[Sp cabinet] "Тип закладу" block is missing in the description of institution #977
['Редагування закладу' page] 'Тип закладу' drop-down box is not displayed #901

@Pabloostr Pabloostr requested a review from litvinets June 7, 2022 16:27
@litvinets
Copy link
Contributor

add this functionality to select institution type in create-provider
add new form ctonrol to provider, update provider model, make sure you really can create provider with this selected field
image
image

Comment on lines 48 to 52
this.store.dispatch(new GetInstitutionStatus());
this.institutionStatuses$
.pipe(
filter((institutionStatuses) => !!institutionStatuses.length),
takeUntil(this.destroy$)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this change please, this field is still needed.
image
image

@litvinets litvinets closed this Jun 9, 2022
@litvinets litvinets deleted the bugfix branch June 9, 2022 10:33
@litvinets litvinets restored the bugfix branch June 9, 2022 10:41
@litvinets litvinets reopened this Jun 9, 2022
@Pabloostr Pabloostr requested a review from litvinets June 11, 2022 18:49
@@ -1,22 +1,23 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove unused imports (output as I see)

@@ -29,6 +30,7 @@ export class ProviderInfoComponent implements OnInit {
readonly ownershipType: typeof OwnershipType = OwnershipType;
readonly ownershipTypeUkr = OwnershipTypeUkr;
readonly providerTypeUkr = ProviderTypeUkr;
readonly institutionTypes = InstitutionTypes;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add empty row after readonly fields

</mat-select>
</mat-form-field>


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove empty row please

});
}

ngOnInit(): void {
this.store.dispatch(new GetInstitutionStatus());
this.provider && this.activateEditMode();
this.passPhotoFormGroup.emit(this.PhotoFormGroup);
console.log(this.PhotoFormGroup)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove console

@Pabloostr Pabloostr merged commit 79196f4 into develop Jun 14, 2022
@Pabloostr Pabloostr deleted the bugfix branch June 14, 2022 06:52
Pabloostr added a commit that referenced this pull request Jun 23, 2022
* fix

* add validation hint to institution

* conflict fix

* test fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants